Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 13 Jan 2010 09:37:38 +0000 (09:37 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 13 Jan 2010 09:37:38 +0000 (09:37 +0000)

Trivial merge